From: Miles Bader <miles@gnu.org>
Date: Mon, 24 Nov 2003 22:19:51 +0000 (+0000)
Subject: Resolve CVS conflicts
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~24900
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=39cca711627d8cf53aeb4cb687f9c4dfd45ea0a8;p=emacs.git

Resolve CVS conflicts
---

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index ea5fd421fe5..35a5780aa45 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -532,3 +532,4 @@ those sub directories of DIR."
 
 ;;; grep.el ends here
  
+;;; arch-tag: 5a5b9169-a79d-4f38-9c38-f69615f39c4d